Merge pull request #252 from K-Phoen/2.0

[WIP] Propel2 integration