Commit
Merge branch 'master' of https://github.com/SmartSolSoftBuilders/RadarFoodTruckAdmin

Conflicts:
	Resources/main_windows/main.js