Commit on Webstorm
Commit on Webstorm changes on main.js
Commit on Webstorm changes on main.js
Commit on Webstorm changes on main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/js/company.js