-./inc/template-functions.php:1153: // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1186: // @TODO Add a little more infos here
-./inc/template-functions.php:1474:// @TODO Lame description for this function
-./inc/template-functions.php:1493: // @TODO Move this in a filter
-./inc/template-functions.php:280: // @TODO Remove this sanity-check if all is fine
-./inc/template-functions.php:593:// @TODO $simple/$constants are deprecated
-./inc/template-functions.php:620: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/template-functions.php:1132: // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1165: // @TODO Add a little more infos here
+./inc/template-functions.php:1453:// @TODO Lame description for this function
+./inc/template-functions.php:1472: // @TODO Move this in a filter
+./inc/template-functions.php:261: // @TODO Remove this sanity-check if all is fine
+./inc/template-functions.php:572:// @TODO $simple/$constants are deprecated
+./inc/template-functions.php:599: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates