new branch
Merge branch 'branch1'

Conflicts:
	Resources/app.js