potentionally fixed threading issue
Merge branch 'master' of github.com:LearningRegistry/LearningRegistry

Conflicts:
	LR/lr/model/resource_data_monitor/incoming_copy_handler.py
Also websetup doesn't execute everytime like i thought it did
Merge branch 'master' of github.com:LearningRegistry/LearningRegistry

Conflicts:
	LR/lr/model/__init__.py
	LR/lr/model/resource_data_monitor/incoming_copy_handler.py
	LR/lr/websetup.py
fix includes
Update setup.py

updated version number
Merge pull request #259 from wegrata/fix_handler_startup

Fix handler startup

verified all tests pass at SRI CI: http://learnreg2.sri.com/job/LearningRegistry-JimKlo-all-branches/19/testReport/