Merge rebranding (6686) into 2014.11.20

Solved conflicts:
admin.php
functions.php