add UI features

grid
menu
resolve conflicts

Conflicts:
	app/scripts/app.js