Merge branch 'master' of https://github.com/DevApp2450/DevApp-A

Conflicts:
	lib/noSql/database.nosql