Code + merge
New files
Merge branch 'master' of https://github.com/CrescendoTeam/Crescendo

Conflicts:
	gen/com/crescendo/crescendo/R.java