refactoring
Merge branch 'master' of https://github.com/raulmacarie/templates

Conflicts:
	js/app.js
	js/views/Slide.js
	js/views/SlideShow.js