integrated angular. All set to integrate functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/config.js
	package.json