Merge pull request #46 from cjwillia/master

More Test Stuff and Fixes for BG_CHECK
Changed some abilities
Merge remote-tracking branch 'upstream/master'
Added ds_store ignore
Merge branch 'master' of https://github.com/sankalpk/gelfand

Merged
merged most recent upstream + added some abilites
Removed the contact_id migrations because they caused a bug
Merge pull request #47 from cjwillia/master

deleted unnecessary migrations
Merge branch 'master' of https://github.com/sankalpk/gelfand
Merge pull request #49 from cjwillia/master

more migrations, it never ends
added more abilities
Merge remote-tracking branch 'upstream/master'
migrated db with individual_id in user
Made last touches to Nav bar. Tabs are aligned
Merged Sethu's changes
Fixed bg_check bug
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'
Migrated database