non-admin menu
chat
more involved chat.
divided into conversations
Merge branch 'master' of https://github.com/heshamsafi/kryptoncms.git

Conflicts:
	kryptoncms/src/main/java/edu/asu/krypton/model/persist/db/Article.java
	kryptoncms/src/main/java/edu/asu/krypton/service/ArticleService.java