Merge branch 'develop' of https://github.com/ajency/xooma-track-go

Conflicts:
	wp-content/themes/twentytwelve/xoomaapp/scripts/common/common.coffee
	wp-content/themes/twentytwelve/xoomaapp/scripts/common/common.js
Merge branch 'develop'

Conflicts:
	wp-content/themes/twentytwelve/xoomaapp/scripts/common/common.coffee
template
small bug fixed
template