AC: change payment term to integer. and update the twiter boostrap
AC: cleaning up the login page and making it configurable, using engine config
Merge branch 'master' of github.com:emclab/projectx

Conflicts:
	spec/dummy/app/controllers/application_controller.rb