add grid
Merge branch 'master' of https://github.com/telerikhackteam14/hackteam14.git
Merge branch 'master' of https://github.com/telerikhackteam14/hackteam14.git

Conflicts:
	Test/scripts/login.js
Reverted drawer screen