4 new sliders
Merge branch 'master' of https://github.com/webcainternet/dmj2

Conflicts:
	public/wp-content/uploads/2013/01/slide_2.jpg