stuff
no message
Merge branch 'master' of https://github.com/stoeffel/sunny

Conflicts:
	SUN/app/controller/Main.js
	SUN/app/view/Main.js
	SUN/resources/css/main.css
	SUN/resources/sass/.sass-cache/1b1cbccc7efa54f6d0a7d39a72da3a265239593b/main.scssc
	SUN/resources/sass/main.scss
	build/Sunny.apk