Edited app name
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.html
Merge remote-tracking branch 'origin/master'
Date searching need bugfix