Fixed the constants are used in the collections. Ticket #1428
Merge branch 'develop' of github.com:pandorafms/pandorafms into develop