3rd version
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/controllers.js
	app/partials/tariffs.html