Dileep | including template files in mangrove egg
Dileep | including view js files in the egg
Pooja/Ashwin | #2456 | Correcting subject unique id creation when there is a space in first three characters of entity type name.
Merge branch '8_0_release' into develop

Conflicts:
	setup.py