Merge branch 'chaudhary' into tanjot

Conflicts:
	app/src/main/java/in/shubhamchaudhary/logmein/ui/MainActivity.java