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

Conflicts:
	.classpath

Signed-off-by: soleasahi <firend52@sina.com>
Merge branch 'master' of https://github.com/soleasahi/ngservice