Merge pull request #1 from zerdliu/master

init: create Aqueducts Service Application
Merge pull request #2 from zerdliu/master

mysql -> mongodb
Merge pull request #3 from zerdliu/master

unicorn & niginx confiuration
Merge pull request #4 from zerdliu/master

first release: dynamic realtime pv chart
adjust dynamic chart
add static_chart
basic static chart is ok
customize db & collection
add nginx & unicorn config
add usage
typo bugfix
refactor nginx conf
Merge pull request #6 from zerdliu/master

redesign model and UI
Merge pull request #7 from zerdliu/master

 fixtures build from factory
Merge pull request #8 from zerdliu/master

encapsulation mongodb ( realtime & not realtime )
Merge pull request #9 from zerdliu/master

build json from mongodb to javascript
Merge branch 'master' of git://github.com/castomer/Aqueducts into castomer-master

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/services.js.coffee
	app/controllers/services_controller.rb
	app/models/service.rb
	app/views/services/index.html.erb
	app/views/services/index.json.jbuilder
build /items.json api