viewport
viewport
Merge branch 'master' of https://github.com/alinulms/ChatZappFinal

Conflicts:
	Chatzapp.v12.suo
	Website/Presentation/Controls/DiscussionControl.ascx
	Website/Presentation/Controls/MessageBoardControl.ascx
	Website/Presentation/Home.aspx