Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Merge branch 'master' of https://github.com/pcncdevelper/git_text.git

Conflicts:
	git_test/views/paltelPayedBillsView.html
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Changes made by Claudia Alawi (claudia3alawi@gmail.com).
Merge branch 'master' of https://github.com/pcncdevelper/git_text.git