let's do this

LEEEERROOOOOYYYY JENNKINNSS
Merge branch 'master' of https://github.com/CrescendoTeam/Crescendo

Conflicts:
	res/layout/texteditor.xml
Merge branch 'master' of https://github.com/CrescendoTeam/Crescendo