update live modifications in the repo
Merge branch 'master' of https://github.com/sarasioux/Melodramatic

Conflicts:
	core/sites/default/modules/melodev/melodev.module