Login User
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/de/ur/mi/android/ting/app/activities/MainActivity.java