Fixed whitespace.
New hidden section for notifications preferences.
Formatted.
add icon
Merge branch 'master' into createIcon
Implemented drop down to set email sending frequency.
Removing test files
Merging with master
Upgrade JUnit to a newest one and creating a profile to run the integration tests
Restructure folder hierarchy on integration tests
Styling progress in combine functionality
Merge branch 'master' into stylingCombine
Merge with master
This is crazy
Initial commit
Done, need to add/update i18n keys
fix line endings
Adding changes into the i18n files
merge from master
Removing unused key