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
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 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
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