Updates.
Merge branch 'hotfix/2013.07.26-1'

* hotfix/2013.07.26-1:
  Updates.
Updatead heading.
Merge branch 'hotfix/2013.07.26-3' into develop

* hotfix/2013.07.26-3:
  Updatead heading.