changed to mysql
Merge branch 'sjur'

Conflicts:
	Gemfile.lock
Merge branch 'master' into sjur
Added file upload & CRUD for plants, sensorvalues