JC: sync to github. Fixed bugs in routes.rb, added nest relation in project, contract and payment controller and views. rspec for contract and payment are not passing.
Merge branch 'master' of github.com:emclab/projectx
Conflicts:
	spec/factories/projectx_contracts.rb