201310241455:Enhacement

Enhacement:add tab to home/index.html
Merge branch 'cool'
Merge branch 'master' of https://github.com/nt46/Imagic

Conflicts:
	log/development.log
	tmp/pids/server.pid