Mississipi

Mississipi
Mississipi

CSS
Merge branch 'Fabrizio' into Naty

Conflicts:
	MVC/css/addEvent.css
	MVC/css/application.css
	MVC/fonts/icomoon.eot
	MVC/fonts/icomoon.svg
	MVC/fonts/icomoon.ttf
	MVC/html/artistsList.html
	MVC/html/eventAdd.html
	MVC/html/listArtists.html
	MVC/html/showEvent.html
	MVC/img/bg.png
	MVC/js/lib/bootstrap.js
	MVC/js/lib/bootstrap.min.js
	MVC/js/views/artistsList.html
	MVC/js/views/eventAdd.html
	MVC/less/application.less
	MVC/less/bootstrap/bootstrap-theme.less
	MVC/less/bootstrap/bootstrap-theme.min.less
	MVC/less/bootstrap/bootstrap.css
	MVC/less/bootstrap/bootstrap.less
	MVC/less/fonts.less
	MVC/less/icomoon.less
	MVC/less/searchBox.less
	MVC/less/searchResult.less
index
Merge branch 'master' into Naty

Conflicts:
	MMReadyDesign/less/buttonsOptions.less
	MVC/js/views/artistsList.html
delete application.css master
mod artistList
Mississipi

Change Desgin
dfsa

fasd
ajoute classes css
Change css

css
Modif main_Naty.js
HUPPIIIIII
Merge branch 'Naty'
Merge branch 'master' into Clélia

Conflicts:
	MVC/index.html