merge
merge
Fixed states, added play specific timeframe feature, cleaned up some code in the web UI