Merge ProfileEdit

Conflicts:
	src/main/java/com/cox/pages/main/CommunicationPage.java
Merge work
Merge work