Incidencias 23, 29
Merge branch 'master' of https://github.com/dagrinchi/APC

Conflicts:
	js/app.js