Changes from angularjs_examples-feature_1
Merge branch 'angularjs_examples-feature_1'

Conflicts:
	README.md