Start integrating and fixing the flow.
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	android/app/src/com/hastagqq/app/MainActivity.java