Fixes functional bugs
Merge master of github. Cleans code too.

Conflicts:
	app/models/land_parcel.rb