moved to testing
Merge remote-tracking branch 'origin/master'
trying to fix fleetster-plugins
trying to fix fleetster-plugins
Merge branch 'release/2.0'

Conflicts:
	bower.json
Merge branch 'release/2.1'
Fix for wrong company attribute.