Remove Id
Add class
Merge remote-tracking branch 'origin/master' into ng

Conflicts:
	src/index.html