Merge pull request #85 from bwestlin/MOB-165

Mob 165 Fix failing tests
Added a LICENSE file
Added license headers.
Fixed merge error.
Merge pull request #86 from iceglow/cleanup

License
Removed unused underscore template.
Updated copyright
Updated copyright
Updated copyright
Changed Android Cert Key Id 
Extracted Android Cert Key Id and iOS Cert Key Id to a global variable
Merge branch 'master' of ssh://git.it.su.se/git/hermes
MOB-165 preload fix
Merge pull request #87 from iceglow/cleanup

Removed unused underscore template.
Merge pull request #88 from lucidus3/master

Changed Android Cert Key Id … Extracted Android Cert Key Id and iOS Cert Key Id to a global variable
Merge pull request #89 from iceglow/cleanup

License stuff
MOB-165 backbutton gradient fix, no search results fix and other smått och gott
Merge branch 'master' of https://github.com/stockholmuniversity/hermes into MOB-165

Conflicts:
	assets/www/css/SU-beta.css
Merge pull request #90 from Maryami/MOB-165

MOB-165 preload fix, backbutton gradient fix, no search results fix etc..