Modified what the functionality includes
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
I have changed the word "mobile" to "web"
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
Created the dashboard and modified the css template to complemnt the dashboard design
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git

Conflicts:
	development/webapp/bbdcom/awards.php
	development/webapp/bbdcom/birthday.php
	development/webapp/bbdcom/dashboard.php
	development/webapp/bbdcom/events.php
	development/webapp/bbdcom/index.php
	development/webapp/bbdcom/menu.php
	development/webapp/bbdcom/style/bootstrap.css
Removed "BBD Communicator" from the menu bar
I have added the php file that retrieves the message from awards.
Changed the background colour on the bbd logo so that it can blend with the web background
The login is working with wits proxy.
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git
Login is working with the wits proxy. Deleted the index.html page.
Fixed the quotations in the awards php file.
I have moved the ducoments into one documentation folder
The documents have been moved into one documentation folder.
created bug defect log, for tracking bugs found during testing.
Had to remove the netbeans files becase it was not merging.
Merge branch 'master' of git@github.com:BbdCoachlab/Communicator.git

Conflicts:
	development/webapp/bbdcom/index.php
	development/webapp/bbdcom/menu.php
I added the updated proect plan