dev 08.05.14
dev 08.05.14
master 08.05.14
Merge remote-tracking branch 'origin/master'
master 08.05.14