Merge pull request #1 from CMPUT301F14T17/master

merge with master
Merge pull request #2 from CMPUT301F14T17/master

merge with master
Complete redo for Comment popup and general style changes
redo for Answer popup
Merge pull request #3 from CMPUT301F14T17/master

merge with master
added strings and removed unused classes
merge with master
Merge pull request #156 from joelkeeling/master

Customized popups