lots of changes for fixing Template use
Merge branch 'develop' of https://github.com/StraightBeastApps/RealBigD-web into develop

Conflicts:
	src/main/scripts/realbigd/rbd/widgets/templates/search.html