Fixes
Merge branch 'master' of //192.168.1.99/www.git/samsonphp/activerecord
Fixed condition parsing