g
Merge branch 'master' of https://github.com/Ao21/DMAF

Conflicts:
	app/scripts/directives/opening.js
g