Added ds_store ignore
Merge branch 'master' of https://github.com/sankalpk/gelfand

Merged
Removed the contact_id migrations because they caused a bug
Merge branch 'master' of https://github.com/sankalpk/gelfand
Made last touches to Nav bar. Tabs are aligned
Merged Sethu's changes
Merge branch 'master' of https://github.com/sankalpk/gelfand into psethu-master
Merge branch 'master' of https://github.com/sankalpk/gelfand
Merge branch 'psethu-master'