AngularJs Click
Merge remote-tracking branch 'origin/master' into ng
Merge remote-tracking branch 'origin/master' into ng
Merge remote-tracking branch 'origin/master' into ng

Conflicts:
	src/index.html
Merge pull request #1 from litealex/ng

Ng