fix swipe bug
Merge branch 'master' of https://github.com/telerikhackteam14/hackteam14.git

Conflicts:
	Test/views/mainView.html
Many things fixed.
Changes made by Ivan Stoyanov (istoyanov@telerik.com).