Merge pull request #14 from pzuraq/add_permissions

Implement adding/removing permissions on Groups
any changes?
any changes?
Add LICENSE file via addalicense.com
any changes?
any changes?
Merge branch 'ugly-duckling' of github.com:pzuraq/formbuilder into ugly-duckling

Conflicts:
	app/views/groups/show.html.erb
Merge pull request #16 from pzuraq/ugly-duckling

Ugly duckling
commit
commit
commit
commit
Working, but needs hstore logic now
Merge branch 'add_permissions' of github.com:pzuraq/formbuilder into add_permissions

Conflicts:
	app/models/permission.rb
commit