add makefile
update version
Merge branch 'develop' of github.com:7kfpun/angularjs into develop
exclude placeholders