* Finish whitelabeling
Merge remote-tracking branch 'hackfoldr/master'