Update admin page
- Add edit and remove company done.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	assets/javascripts/ui.coffee
	assets/stylesheets/global.styl