JS

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>
Merge branch 'master' of https://github.com/alfabrad/Digital_Friday

Signed-off-by: Jesús Antonio García Valadez <zerovamp@hotmail.com>

Conflicts:
	Code/templates/js/main.min.js
	Code/templates/js/plugins.min.js
	Code/templates/js/plugins.min.map
	config.codekit