done with feature-3 branch
Merge branches 'master' and 'feature-3'
changing feature name scheme to whats in the SRS
grrr...still cleaning