Fix for magic my page
Merge branch 'i18962'

Conflicts:
	assets/javascripts/usability.js
Opps
# Superfix for custom_help_url
Superfix for progress-bar
no message
Removed redundant include_tag
change logic
#21707 Added logo
#21424 added link to wip-diagram in menu
Merge branch 'master' of https://github.com/tdvsdv/usability
Code style fixes
#19948 Added new button to wiki editing buttons panel.
#21707 Fixed
Merge branch 'i21707'
Merge branch 'master' into i19948
#19948 Added button.
#19948 moved stylesheet include
#19948 Looks to be done.