some bugs from buglist are fixed
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza

Conflicts:
	db/schema.rb