update
Merge branch 'master' of https://github.com/bitrainy/michelin

Conflicts:
	webapp/.DS_Store
update