Merge branch 'master' of https://github.com/heshamsafi/kryptoncms.git

Conflicts:
	kryptoncms/src/main/java/edu/asu/krypton/service/CommentService.java