feature update
panelizer settings
feature update
removing make.inc
feature update
feature update
confict resolution
feature update
minor tweaks
adding permissions for artist/editor role
permissions tweaks
better formats
update to jive better with panopoly 1.2
Merge pull request #23 from gusaus/7.x-1.x-panels

refactoring