A security bug fixed in signing up
Merge branch 'develop'
Merge branch 'develop'
@ core/db/models/item.php : a bug fixed, cache related
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	core/db/models/item.php
@core/db.models/item.php: a fix happened
Merge branch 'develop'

Conflicts:
	core/db/models/item.php
Merge branch 'develop'

Conflicts:
	core/db/models/item.php
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
+ viewNoteView.phtml
Merge branch 'develop'
Merge branch 'develop'
@ core/db/models/folder.php
@ core/db/models/item.php
Huge hot fixes on edit() method of both
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	core/db/models/item.php
zinux 3.1.6 is up
Some enum modifcation + delete/restore functionality added