Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
menu changes
Merge remote branch 'upstream/master'
admin?
restored devise views