MC20141001-04
Merge branch 'gh-pages' of https://github.com/SectionInformatiqueRoc/framework-mvc into gh-pages

Conflicts:
	index.html