20140918
Merge branch 'development' of https://github.com/adlnet/warriorAthlete into development