Merge pull request #16 from Caf131/dev-doo-dah-cforehand

Revised Activities, Added new database dump
Merge pull request #17 from Caf131/dev-doo-dah-cforehand

SQL updates
Merge pull request #18 from Caf131/dev-doo-dah-cforehand

Various Updates
Merge pull request #19 from Caf131/dev-doo-dah-cforehand

New SQL Dump
Merge pull request #20 from Caf131/dev-doo-dah-cforehand

Significant Updates
Merge pull request #21 from Caf131/dev-doo-dah-cforehand

Dev doo dah cforehand
Merge pull request #24 from Caf131/dev-doo-dah-cforehand

Added Login Support
Merge pull request #25 from Caf131/dev-doo-dah-cforehand

Added Cancel click function for the Registration Control
Merge pull request #26 from Caf131/dev-doo-dah-cforehand

Wired up Emotion Selection and Activities
Merge pull request #28 from Caf131/master

Pull Request
Merge pull request #29 from Caf131/JDlux-master

Merge pull request #28 from Caf131/master
Merge pull request #30 from Caf131/master

Merge pull request #29 from Caf131/JDlux-master
Merge pull request #31 from Caf131/JDlux-master

Merge pull request #30 from Caf131/master
Merge pull request #32 from Caf131/master

Merge Pull Request