babies are flooding!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/directives.js
Added missing files