Creating template
Add bootstrap ui
Add bootstrap ui
Edit main menu.
Edit main menu
Merge branch 'origin/develop'
Merge branch 'origin/master'

Conflicts:
	README.md
	package.json
	public/stylesheets/style.css
	routes/index.js
	routes/user.js
	server.js
	views/index.jade
	views/layout.jade
remove the unused file
Config openshift database.
Revert commir

Merge branch 'origin/master'

Conflicts:
	README.md
	package.json
	public/stylesheets/style.css
	routes/index.js
	routes/user.js
	server.js
	views/index.jade
	views/layout.jade (reverted from commit d9b43066601aca009918808b6587dd4f0d4440eb)
Merge branch 'origin/master'
Merge branch 'origin/master' (reverted from commit c35a424e2395ce669e6449f68e8c1b00a49f9085)
The db config.