renaming and cleanup
Merge branch 'master' of github.com:swiftyguys/Swifty-Page-Manager

Conflicts:
	plugin/swifty-page-manager/js/swifty-page-manager.js