fixes
Merge branch 'master' of https://github.com/nkskalyan/Team_Everest

Conflicts:
	blueprints/frontend/__init__.py
view matrix working fine i guess
Merge branch 'master' of https://github.com/nkskalyan/Team_Everest

Conflicts:
	blueprints/frontend/__init__.py