Merge branch 'pr/5' into TC-Community-2014-02-12

Conflicts:
wp-content/plugins/TcApi-hookup/includes/ajax_func.php
wp-content/plugins/TcApi-hookup/includes/public.php