add player - for merge. Dirty commit
Merge remote-tracking branch 'origin/rewrite' into rewrite

Conflicts:
	app/app.module.js
	app/layout/layout.module.js
	index.html
Merge remote-tracking branch 'origin/rewrite' into rewrite
Merge remote-tracking branch 'origin/rewrite' into rewrite

Conflicts:
	app/app.module.js
	app/layout/layout.module.js
	index.html