Tidied.
Changed customer user item to font awesome, thanks to Nils Leideck.
Updated DBUpdate script to migrate more fontawesome icons.
Including Package Manager Merge Support feature.
Merge remote-tracking branch 'upstream/master'