Merge remote-tracking branch 'origin/master'

# Conflicts:
#	signals/macd.py

signals/ema_arrangement.py

@@ -5,7 +5,7 @@ import tg
 import datetime
 import setting
 import db
-import signal_builder
+import signals.signal_builder as signal_builder
 flags = {}
 
 def check_ema_arrange(data):

strategy_test.py

@@ -7,4 +7,4 @@ import signals.macd as macd
 symbols = bn.symbols()
 
 for s in symbols:
-    macd.run(s, '1h')
+    macd.run(s, '15m')