Add 'oz' as a weight unit for harvesting
Merge pull request #381 from maco/dev

Add 'oz' as a weight unit for harvesting
update harvest model test for oz
fix typo. pint was ping
Merge pull request #382 from maco/dev

update harvest model test for oz
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
updating test for harvest units to list the valid units and adding a task to correct misspelled pint harvests already in the database
Merge pull request #384 from maco/dev

test & task for the ping -> pint change
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
created list of crop wranglers on the crop wranglers page
remove extra method
fixed role factory to not create extra roles when new members
changed method so that you can now call crop_wranglers and admins. meta-programming ftw
Merge pull request #383 from Marlena/pg_crop_wranglers

created list of crop wranglers on the crop wranglers page
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
Fixed twitter link on contact page
Merge pull request #387 from Skud/contact-twitter

Fixed contact page error
Merge remote-tracking branch 'upstream/bootstrap3' into dev

Conflicts:
	Gemfile.lock
Merge branch 'dev' into bootstrap3