bebehei/condecht-clone — pull request #2 by bebehei (2013-10-06 00:57:14+00:00)
Title: MERGE DEVELOPMENT into master

testmerge