Merge branch 'master' into Jinsoo
Commit after meeting 4/14/14
Merge branch 'Jinsoo'
Merge branch 'master' of https://github.com/vanguardofnight/Nutriquest_1