Merge pull request #45 from yalmasri/master

1
Merge pull request #46 from yalmasri/master

Menu Type
category - shop

category - shop
push

push
public

public
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
category - migrate

category - migrate
password admin

password admin
update

update
Merge pull request #16 from galaviz/master

category - migrate