Merge branch 'master' of https://github.com/rainbowbreeze/codethefuture2014

Conflicts:
	mobile/NinjaBoo/mobile/src/main/res/values/strings.xml