added error checking when logging in
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/tom/myapplication/FragmentViewer.java
	app/src/main/res/layout/login.xml
	app/src/main/res/layout/profile_fragment.xml