1511
Merge branch 'master' of https://github.com/balyam/elimaikz

Conflicts:
	db/schema.rb
1511
predeploy