Web: Get broken data from Parse
Web: Merge sidebar and angular

Conflicts:
	Web/index.html