today's commit
Merge branch 'master' of https://github.com/saritmishra/ng-extension-console

Conflicts:
	app/views/viewExtensions.html