2/17 update of employees views
Merge branch 'master' of https://github.com/fineday32/TempIoIo

Conflicts:
	log/development.log
	test/controllers/helper_controller_test.rb
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/3760679cab534a5c45dc4657e59768aa
	tmp/cache/assets/development/sprockets/5cdbb816cf2fbb1a4880fcbb2c35a39a
	tmp/cache/assets/development/sprockets/5df47b11b9e847d2d10ebdcbb145b5e4
	tmp/cache/assets/development/sprockets/6cc2a41e653fff544e9125621456851c
	tmp/cache/assets/development/sprockets/862dc6fc1175ec0b07f90c34f83457ca
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/f9422ee456f9e91248ed432170b10077
	tmp/pids/server.pid