Changes made by Ivan Stefanov (inj.stefanov@gmail.com).
Merge branch 'master' of https://github.com/ivanstef/Chatapp123123.git

Conflicts:
	PhotoChatRoll/scripts/app/rollette.js
	PhotoChatRoll/views/rollette.html
Changes made by Ivan Stefanov (inj.stefanov@gmail.com).