choice_java
Merge branch 'master' of https://github.com/mrmeme/Tastymony-Android.git

Conflicts:
	src/com/tastymovie/main/MainActivity.java