Merge branch 'master' into develop
cambiado bower.json
Merge branch 'awesomefield'
cambiado bower.json
Merge branch 'master' of github.com:jgab-net/siplik-frontend

Conflicts:
	app/views/patients/view.html