Updated verification..
Merge remote-tracking branch 'origin/master'

Conflicts:
	html2canvas-proto/html2canvas_proto/db.sqlite3
Fixed navbar bug