UI Changes and Activity Changes
Conflict Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Compile/app/src/main/java/compile_inc/compile/NewContactActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Compile/app/src/main/java/compile_inc/compile/NewContactActivity.java