dasd
Merge branch 'master' of https://github.com/ncosmin2001/angular2

Conflicts:
	app/views/edit.html