#25025
#25025
#25025
#25025 moved functions to custom menu
#25025 moved to custom menu
#25025 fixed magnific popup
Merge branch 'i25025'

Conflicts:
	assets/javascripts/usability.js