Changes for nilavu worker
Merge remote-tracking branch 'ta/master'

Conflicts:
	lib/megam/core/account.rb