Merge pull request #413 from settinghead/master

Fix uglification issue for auth button controller logic
Merge remote-tracking branch 'upstream/master'