Merge branch 'master' of https://github.com/designcreateplay/NodeBB

package.json

@@ -39,7 +39,7 @@
     "uglify-js": "~2.4.0",
     "validator": "~1.5.1",
     "nodebb-plugin-mentions": "~0.1.16",
-    "nodebb-plugin-markdown": "~0.2.1",
+    "nodebb-plugin-markdown": "~0.3.1",
     "nodebb-theme-vanilla": "~0.0.12",
     "nodebb-theme-cerulean": "0.0.10",
     "cron": "~1.0.1",

src/routes/user.js

@@ -539,7 +539,7 @@ var fs = require('fs'),
 						if (!data.birthday) {
 							data.age = '';
 						} else {
-							data.age = new Date().getFullYear() - new Date(data.birthday).getFullYear();
+							data.age = Math.floor((new Date().getTime() - new Date(data.birthday).getTime()) / 31536000000);
 						}
 
 						function canSeeEmail() {
@@ -581,4 +581,4 @@ var fs = require('fs'),
 
 	};
 
-}(exports));
+}(exports));