Thu Nov 27 17:55:34     2014
Merge branch 'tmp' into dev