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

Conflicts:
	app/controllers/sons_controller.rb
1509