Change to sitemod
Merge branch 'master' of github.com:stevekessler/LMIC

Conflicts:
	modules/custom/livestock_monitor/livestock_monitor.module
	modules/custom/scripts/filemove.sh
	modules/entity/entity.info.inc
	modules/entity/entity.test