refactor code
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development

Conflicts:
	app/models/tpn.rb
	app/models/user.rb
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development

Conflicts:
	Gemfile
	app/controllers/tpns_controller.rb
	app/models/tpn.rb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb