-d
das
Merge branch 'master' of https://github.com/squeak415/AngularAplic into develop

Conflicts:
	my-app/src/main/java/com/mycompany/app/App.java
da