android fix
Merge branch 'master' of git@github.com:uncharted/Question-Bridge-Mobile.git

Conflicts:
	js/main.js