Merge branch 'master' of https://github.com/soleasahi/ngservice

Conflicts:
	.classpath
Merge branch 'master' of https://github.com/soleasahi/ngservice