app17
Merge pull request #6 from 54wang17/development

app17
Merge pull request #72 from 54wang17/master

12/4/2014 Master - 17master