cambio de master
webengage
Merge branch 'dev'

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/login.js
	app/scripts/controllers/main.js
	app/scripts/controllers/products.js
	app/scripts/controllers/recurrence.js
	app/scripts/directives/graphNav.js
	app/scripts/directives/header.js
	app/scripts/helpers/connetion.js
	app/scripts/helpers/routingConfig.js
	app/scripts/services/dailyStats.js
	app/scripts/services/resumeRecurrence.js
	app/views/main.html
	app/views/products.html
	app/views/recurrence.html
	app/views/templates/ltxHeader.html
	bower.json
minor fixed