.
Merge branch 'master' of https://github.com/hdmaker/amt-project

Conflicts:
	apidoc-seed-front-end/raml.json