Changed db object of pydb to pdb in web2py to allow use of web2py db object
Merge pull request #15 from montaggroup/search_author_guid

added author by guid search
Merge pull request #16 from montaggroup/author_merge_paging_fix

improved author search in fusion dialog
Merge branch 'master' into rename_db_to_pdb

Conflicts:
	web2py/applications/montag/controllers/default.py
fixed merge issue
Merge pull request #17 from montaggroup/rename_db_to_pdb

Changed db object of pydb to pdb in web2py to allow use of web2py db obj...
Merge remote-tracking branch 'origin/master' into dragdrop_file_upload