Safe commit from mac
Merge branch 'master' of https://github.com/iuuso/TrafficTracker

Conflicts:
	assets/js/traffictracker.default.js
Merge