friendzone
Merge branch 'master' of https://github.com/svenne87/betbattle

Conflicts:
	Resources/android/lib/FontAwesome.js