Sharing with trev
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of github.com:neosavvy/ng-conf-hack

Conflicts:
	.idea/workspace.xml