Merge branch 'dev'

Conflicts:
	conf/app.conf

conf/app.conf

@@ -4,26 +4,32 @@
 
 http.port=9000
 
-site.url=http://localhost:9000
+site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
 
 # mongdb
 db.host=localhost
-#db.host=leanote
 db.port=27017
 db.dbname=leanote # required
+<<<<<<< HEAD
 db.username=root # if not exists, please leave it blank
 db.password=abc123 # if not exists, please leave it blank
 # or you can set the mongdb url
+=======
+db.username= # if not exists, please leave it blank
+db.password= # if not exists, please leave it blank
+# or you can set the mongdb url for more complex needs the format is:
+>>>>>>> dev
 # mongodb://myuser:mypass@localhost:40001,otherhost:40001/mydb
 # db.url=mongodb://root:root123@localhost:27017/leanote
 
+# You Must Change It !! About Security!!
+app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y 
 
 #--------------------------------
 # revel config
 # for dev
 #--------------------------------
 app.name=leanote
-app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y
 http.addr=
 http.ssl=false
 cookie.httponly=false