Merge develop into david

Conflicts:
	nbproject/project.properties
	public_html/cliente/categorias.html
	public_html/cliente/css/index.css
	public_html/cliente/css/index.css.map
	public_html/cliente/css/main.css
	public_html/cliente/css/main.css.map
	public_html/cliente/css/navbar.css
	public_html/cliente/css/navbar.css.map
	public_html/cliente/css/responsive.css
	public_html/cliente/css/responsive.css.map
	public_html/cliente/libs/CreativeButtons/README.md
	public_html/cliente/libs/CreativeButtons/css/default.css
	public_html/cliente/scss/index.scss
	public_html/cliente/scss/main.scss
	public_html/server/sql/migrations/V1__TablesCreated.sql