Fixed Lint errors
Merge branch 'develop' of git@github.com:Amab/SWADroid.git into develop

Conflicts:
	SWADroid/res/layout/preference_child.xml
	SWADroid/res/layout/preference_child_summary_error.xml
Updated gitignore