some cleanup
Merge remote-tracking branch 'upstream/master'
merge latest code 2014-05-08 16:36
add transaction in admin/restaurants