Merge branch 'master' into breaking-news

Conflicts:
	public/js/app.js
Store conf in json file
pass module conf to frontend app
shelf.js is not good, trying node-persist instead
storage system ok
duplicate storage init
very first draft of module configuration form
display modules conf
Merge branch 'master' into tk-admin-interface
Merge branch 'master' into tk-admin-interface
Merge branch 'master' into tk-admin-interface

Conflicts:
	Gruntfile.js
	public/css/custom.css
	public/js/modules/git/backend.js
	public/js/modules/github/backend.js
	public/js/modules/jenkins/backend.js
	public/js/modules/trello/backend.js
	public/js/modules/twitter/backend.js
	src/office-module.js
	src/server.js
use -proxy option from grunt to disable proxy
Merge branch 'master' into tk-admin-interface

Conflicts:
	public/css/custom.css
fix chat css layout
move module conf code to Office lib
update start stop service with grunt cli
testing css grid layout
fix some bugs on backoffice + rename socketio event + add some comments
grid layout ok on canary and chromium
Merge branch 'tk-add-delete-module' into tk-admin-interface