Home temp commit:2014-10-22
Merge branch 'dev'