Add history changes
Merge branch 'master' of
https://github.com/lordfelipe/portal-manager.git

Conflicts:
	portal-manager/public/javascripts/app/services.js
	portal-manager/views/includes/history-pagination.jade
	portal-manager/views/sections/history.jade