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

Conflicts:
	app/controllers/sons_controller.rb
	app/models/son.rb
device cancan