.
Merge branch 'master' of
https://github.com/freakingpotatoes/NI2014-AppAndroid.git

Conflicts:
	patatapp/www/index.html
..