a
Merge branch 'master' of https://github.com/woozam/myapp

Conflicts:
	bin/SNULife.apk
	bin/classes.dex
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	bin/resources.ap_
a