Merge pull request #14 from xurizaemon/7.x-1.x-code_style

7.x 1.x code style
Merge pull request #15 from xurizaemon/7.x-1.x-labels

7.x 1.x labels
Merge branch '7.x-1.x' of github.com:eileenmcnaughton/civicrm_entity into 7.x-1.x