Merge branch 'ui-framework' of ssh://github.com/skyjake/Doomsday-Engine into ui-framework
Conflicts: doomsday/libdeng2/src/data/bank.cpp
Merge branch 'ui-framework' of ssh://github.com/skyjake/Doomsday-Engine into ui-framework
Conflicts:
doomsday/libdeng2/src/data/bank.cpp