Pull ok#1

Open

MaliRobot wants to merge 12 commits intoMaliRobot:masterfrom

haklabbeograd:master

Commits on Nov 14, 2014

Commits on Nov 18, 2014

Commits on Nov 24, 2014

pyalarm: alarm system
crackleware
committed
dopunjeno izdanje
antiapsurd
committed

Commits on Dec 3, 2014

separate thread for alarm sound playback; alarm duration parameter
crackleware
committed

Commits on Jan 21, 2015

Commits on Jan 25, 2015

DB heroku fix & wsh.py
antiapsurd
committed
py audio mp3
antiapsurd
committed