Huge rewrite notePad search... fix lot of bugs, and got lot new bugs ) (in progress... unstable)
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2

Conflicts:
	v2/js/libs/fullcalendar.js
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2

Conflicts:
	v2/js/libs/fullcalendar.js