Menuextension
Payment module
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample_app/.idea/sample_app.iml
	sample_app/.idea/workspace.xml
	sample_app/app/helpers/menu_helper.rb