MO-163 landscapetest
Merge branch 'master' of https://github.com/stockholmuniversity/hermes into MOB-163

Conflicts:
	assets/www/config.xml
MOB-163 old sizes deleted fix
MOB-163 manifest xml splash portrait fix
MOB-163 manifest xml splash portrait unfix
Merge pull request #121 from lucidus3/master

gradle copySplash fix
We probably want to run popup('close') for all popups
Using the english name (of locations) in infoWindow
using i18n to get locale instead of getRootLanguage private method.
MOB-163 Fixed font sizes and word wrapping for buttons. Fixed header styles. Added splash screen for iPad Retina displays.
MOB-163 Fixed font sizes and word wrapping for buttons. Fixed header styles. Added splash screen for iPad Retina displays.
Merge pull request #122 from iceglow/cleanup

We probably want to run popup('close') for all popups
MOB-163 Fixed font sizes and word wrapping for buttons. Fixed header styles. Added splash screen for iPad Retina displays.
MOB-163 Fixed indentation in config.xml
MOB-163 Fixed indentation in config.xml again
Merge branch 'master' of github.com:stockholmuniversity/hermes into MOB-190
MOB-163 Added phonegap license text
MOB-163 Removed redundant styling link
MOB-163 Removed redundant splash image
Merge pull request #123 from carllarsson/MOB-163

Mob 163