Modified IntelliJ DB config on mac
changed .gitignore
changed .gitignore
changed .idea
fixing idea?
fixing idea?
replaced from production.
Merge branch 'Production'

Conflicts:
	sites/all/modules/custom_features_ImmunizationEd/immunizationed_core/immunizationed_core.strongarm.inc
another fresh pull from production
added modules from mac
added modules from mac
configured Intellij at office
sites\all\modules downloaded from production
Merge branch 'master' of https://github.com/jraviotta/immunizationed
Fresh DL from production