Sammi 20141029
Sammi 20141029
Sammi 20141029
Merge remote-tracking branch 'origin/master'
Sammi 20141029
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/find/find.js
	templates/app_index.html
Sammi 20141029