updated 20140818
Merge branch 'develop'
updated 2014
Merge branch 'develop'