minor changes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
edited historyViewController
Merge remote-tracking branch 'origin/master'