facebook app ID condition handled
Merge branch 'master' into develop

Conflicts:
	wp-content/themes/twentytwelve/xooma-template.php
comments and refactoring
Merge branch 'master' into develop
save measurements success handler
Merge branch 'master' into develop
reminder plugin
Merge branch 'develop'
Facebook profile picture