Exceptions handling when some contents were null
Merge remote-tracking branch 'origin/master'

Conflicts:

	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/View/MainActivity.java