Moved timeline functions in a separate file
Merge remote-tracking branch 'origin/master'

Conflicts:
	static/js/pwpolicy.js
Merge remote-tracking branch 'origin/master'