code optimized
bug fix
database change
Merge branch 'master' of https://github.com/krison44/corp

Conflicts:
	app/models/attendance.rb
update with AJAX