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

Conflicts:
	kryptoncms/src/main/webapp/resources/js/Main.js
scaffold Message
cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	kryptoncms/src/main/java/edu/asu/krypton/model/message_proxies/AlbumMessage.java
	kryptoncms/src/main/java/edu/asu/krypton/model/persist/db/Album.java
	kryptoncms/src/test/java/edu/asu/krypton/model/repository/PhotoRepositoryTest.java