Merge branch 'master' of https://github.com/hasrimy-tech/tasks

Conflicts:
	assets/css/min/style.min.css
	assets/js/min/scripts.min.js
	cache/.mincache
	cache/css/267ca0042b36385ddac2d5156b3dc2fb
	cache/css/2bca2d2bd9c2f5504042c72d74276f25
	cache/css/49efd127c04e3d67a30b36335d290d8d
	cache/css/778a3f1b8975284d1c82b880f6e5fe04
	cache/css/c02e1c51f47f1caeb8f52bb08353bc34
	cache/js/163eadc121f450b240fef40620a8fac5
	cache/js/50019701e74cf7193629e7609eb1bc3a
	cache/js/abad61733e5d22a9c09cccdb26174502
	cache/js/dbedd756968072d2150f54d5bf7d66ed
	cache/js/f59ec89ae83c72462d1d0aa2bb911675
Merge branch 'master' of https://github.com/hasrimy-tech/tasks

Conflicts:
	assets/css/min/app.style.min.css
	assets/js/min/scripts.min.js
	cache/.mincache
	cache/css/267ca0042b36385ddac2d5156b3dc2fb
	cache/css/2bca2d2bd9c2f5504042c72d74276f25
	cache/css/49efd127c04e3d67a30b36335d290d8d
	cache/css/778a3f1b8975284d1c82b880f6e5fe04
	cache/css/c02e1c51f47f1caeb8f52bb08353bc34
	cache/js/163eadc121f450b240fef40620a8fac5
	cache/js/50019701e74cf7193629e7609eb1bc3a
	cache/js/abad61733e5d22a9c09cccdb26174502
	cache/js/dbedd756968072d2150f54d5bf7d66ed
	cache/js/f59ec89ae83c72462d1d0aa2bb911675