Merge remote-tracking branch 'origin/1.1'
Merge branch '1.2'
Merge branch '1.2'
Merge branch '1.3'
last
Merge branch 'trunk'
delete images folder inside
Merge pull request #7 from serumax/master

trunk to master
Merge branch 'trunk'
test server
Merge branch 'trunk'
master