testing functions after wp_debug
Merge branch 'develop' of https://github.com/ajency/xooma-track-go into develop

Conflicts:
	wp-content/themes/twentytwelve/functions/functions.php
Merge branch 'develop' of https://github.com/ajency/xooma-track-go into develop

Conflicts:
	wp-content/themes/twentytwelve/xoomaapp/inline-templates.php
Merge branch 'develop' of https://github.com/ajency/xooma-track-go into develop

Conflicts:
	wp-content/themes/twentytwelve/xooma-template.php
Merge branch 'develop' of https://github.com/ajency/xooma-track-go into develop
Merge branch 'develop' of https://github.com/ajency/xooma-track-go into develop