Ignore .idea files
Merge fix

Signed-off-by: psoto <psoto23.ps@gmail.com>
Merge branch 'master' of github.com:Exartu/Exartu-CRM

Conflicts:
	client/lib/asubscriptions/collections.js