Using the english name (of locations) in infoWindow
using i18n to get locale instead of getRootLanguage private method.
Merge branch 'master' of github.com:stockholmuniversity/hermes into MOB-190
MOB-190 Rebuilt getting translated attributes from model to using a generic mixin and started with tests for InfoWindowView
tests for infoWindow
Orientation locked to portrait
Merge pull request #125 from iceglow/cleanup

Orientation locked to portrait
MOB-166 Added marker pins for locations, as well as .psd file for pin
MOB-190 Tests for InfoWindowView
Merge pull request #126 from bwestlin/MOB-190

MOB-190
Cleanup - Added more tests
Merge pull request #128 from pmampe/cleanup

Cleanup - Added more tests
MOB-166 Removed extra linebreak
Merge pull request #127 from carllarsson/MOB-166

MOB-166 Added marker pins for locations, as well as .psd file for pin
Merge branch 'master' of github.com:stockholmuniversity/hermes into cordova-2.7.0

Conflicts:
	assets/www/config.xml