Merge branch 'master' of https://github.com/apo-j/PMAC

Conflicts:
	db/schema.rb
New changelist
New changelist