???
Merge branch 'master' of https://github.com/Zenj1n/Watch-List

Conflicts:
	MyApplication/build/dex-cache/cache.xml
Merge branch 'master' of https://github.com/Zenj1n/Watch-List

Conflicts:
	MyApplication/Mealspotting/Mealspotting.iml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fix
???
exploded
app version
ratings
ratings finished
ratings finished
"progress"in progress
merge Jason