version alpha6
added make.inc
Merge branch '7.x-1.x-panels' of github.com:Pushtape/pushtape_events into 7.x-1.x-panels

Conflicts:
	pushtape_events.info
Merge pull request #17 from discipolo/7.x-1.x-panels

7.x 1.x panels update project status url
feature update