Modification js
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palab
Good changes
Conflicts:
	js/category.js
	js/script.js
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palaba