Changes made by Patrick Walgis (p.walgis@chili.ch).
Changes made by Patrick Walgis (p.walgis@chili.ch).
Merge branch 'master' of https://github.com/lucafik/boppapp.git

Conflicts:
	bopp_hybrid2013/App_Resources/Android/drawable-nodpi/splashscreen.9.png
Changes made by Patrick Walgis (p.walgis@chili.ch).
Merge branch 'master' of https://github.com/lucafik/boppapp.git
Changes made by Patrick Walgis (p.walgis@chili.ch).
Merge branch 'master' of https://github.com/lucafik/boppapp.git
Changes made by Patrick Walgis (p.walgis@chili.ch).
Changes made by Patrick Walgis (p.walgis@chili.ch).