diff --git a/blog/wp-content/plugins/collabpress/cp-core.php b/blog/wp-content/plugins/collabpress/cp-core.php
index c35a7f0..046f51c 100644
--- a/blog/wp-content/plugins/collabpress/cp-core.php
+++ b/blog/wp-content/plugins/collabpress/cp-core.php
@@ -101,6 +101,9 @@ function cp_wp_add_stylesheet() {
     <?php
 }
 
-add_action('admin_head', 'cp_wp_add_stylesheet');
-
+//temp fix, should do: http://planetozh.com/blog/2008/04/how-to-load-javascript-with-your-wordpress-plugin/
+//only load JS if on a CollabPress page
+If (strpos($_SERVER['REQUEST_URI'], 'cp')>0) {
+	add_action('admin_head', 'cp_wp_add_stylesheet');
+}
 ?>
\ No newline at end of file
diff --git a/blog/wp-content/plugins/collabpress/cp-core/cp-core-isset.php b/blog/wp-content/plugins/collabpress/cp-core/cp-core-isset.php
index e63dde0..aae1f9f 100644
--- a/blog/wp-content/plugins/collabpress/cp-core/cp-core-isset.php
+++ b/blog/wp-content/plugins/collabpress/cp-core/cp-core-isset.php
@@ -8,7 +8,7 @@ if ( isset($_POST['cp_add_task_button']) ) {
 	
 	$cp_auth = $current_user->ID;
 	$cp_users = esc_html($_POST['user']);
-	$cp_date =  date("Y-m-d H:m:s");
+	$cp_date = current_time('mysql');
 	$cp_title = esc_html($_POST['cp_title']);
 	$cp_details = esc_html($_POST['cp_details']);
 	$cp_due_date = $_POST['cp_tasks_due_month'] ."-". $_POST['cp_tasks_due_day'] ."-". $_POST['cp_tasks_due_year'];
@@ -227,7 +227,7 @@ if ( isset($_POST['cp_add_comment_button']) ) {
 	$cp_task_comment = esc_html($_POST['cp_task_comment']);
 	$cp_task_title = $task_data->title;
 	$cp_project_title = $project_data->title;
-	$cp_date =  date("Y-m-d H:m:s");
+	$cp_date =  current_time('mysql');
 	$cp_auth = $current_user->ID;
 	$cp_users = esc_html($_POST['cp_author_id']);
 	
diff --git a/blog/wp-content/plugins/collabpress/cp-loader.php b/blog/wp-content/plugins/collabpress/cp-loader.php
index 928904e..25206cb 100644
--- a/blog/wp-content/plugins/collabpress/cp-loader.php
+++ b/blog/wp-content/plugins/collabpress/cp-loader.php
@@ -5,7 +5,7 @@ Plugin Name: CollabPress
 Plugin URI: http://wordpress.org/extend/plugins/collabpress/
 Description: CollabPress adds project and task management to WordPress.
 Author: WebDevStudios
-Version: 0.5
+Version: 0.5.2
 Author URI: http://webdevstudios.com/
 */
 
@@ -17,7 +17,7 @@ if (!function_exists ('add_action')) {
 }
 
 // Define current version
-define( 'CP_VERSION', '0.5' );
+define( 'CP_VERSION', '0.5.2' );
 
 // Add "View CollabPress Dashboard" link on plugins page
 $cp_plugin = plugin_basename(__FILE__); 
diff --git a/blog/wp-content/plugins/collabpress/readme.txt b/blog/wp-content/plugins/collabpress/readme.txt
index 2f30ceb..e1e1d34 100644
--- a/blog/wp-content/plugins/collabpress/readme.txt
+++ b/blog/wp-content/plugins/collabpress/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: task, management, basecamp, to do, projects, planning, tracking, reporting
 Requires at least: 2.9
 Tested up to: 2.9.2
-Stable tag: 0.5
+Stable tag: 0.5.2
 
 Project management and task tracking software for WordPress and WPMU
 
@@ -31,6 +31,12 @@ Works with WordPress and WordPress MU
 
 == Changelog ==
 
+= 0.5.2 =
+* Fixed JavaScript bug conflicting w/ plugins and themes
+
+= 0.5.1 =
+* Fixed date formatting bug on comments and tasks
+
 = 0.5 =
 * Add and view comments for tasks
 * Edit tasks
@@ -59,6 +65,9 @@ Works with WordPress and WordPress MU
 
 == Upgrade Notice ==
 
+= 0.5.2 =
+* Fixed JavaScript bug conflicting w/ plugins and themes
+
 = 0.5 =
 * adds a bunch of new features including task editing, task comments, uninstallation script, and more