html structure link connection neria
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers.js
	app/test.html