Merge remote-tracking branch 'nistormihai/master'

Conflicts:
	dist/ng-sir-trevor.js
	dist/ng-sir-trevor.min.js
	ng-sir-trevor.js