changed to marionette from ajency
Merge branch 'master' of https://github.com/ajency/xooma-track-go
Facebook Id
change in workflow plugin
facebook cordova plugin integrated
Merge branch 'master' of github.com:ajency/xooma-track-go

Conflicts:
	wp-content/themes/twentytwelve/xooma-template.php
facebookConnectPlugin integrated