20140213 sprint 1

Merging Sprint 1 into master