Merge pull request #111 from Monseigneur/master

Fixed code, tests, and implementation
Added save button functionality for ConditionRuleViewerActivity.java. Also
fixed a bug where the static field "filterName" in FilterMenuActivity was
not being reset to the empty string after a filter was successfully saved
and added.
Merge remote-tracking branch 'upstream/master'
put possible condition_add_activity.xml for future use maybe
change conditionRuleViewer and now it works the way it should in
final product (some ui change may be needed)
change condtion_add_activity.xml so that it matches current ui standard
change conditionAdderActivity.java by hooking up all the events
Merge pull request #114 from WhatAdun/master

condition rule ui page read comment for more infomation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	EclipseProject/src/weatherOracle/activity/ConditionRuleViewerActivity.java
Merge pull request #118 from Tim727/master

just rying to resolve a confilct ..
Remove unused imports and add JavaDoc comment
Remove visibility in warning
Significantly cleaned up FilterActivity ... fixing indentation issues and
removing unnecessary/old commented code. Also added a "setName" method to
Filter.java
Merge pull request #120 from Tim727/master

Cleaned up FilterActivity and added "setName" method to Filter.java
Merge remote-tracking branch 'upstream/master'
further cleaned up FiltersActivity to make it more readable/welloraganized
Merge pull request #121 from Tim727/master

Further cleaned up FiltersActivity
Merge remote-tracking branch 'upstream/master'
updated ConditionRuleView and TimeRuleViewer to have the appropriate
initializeSaveButton() which resets the tab to the name screen if the
current name is invalid when the user tries to save. I'm also now passing
in an empty filter in the intent from FiltersActivity to
FilterMenuActivity when the "Add Filter" button gets pressed. I've also
move the static field conitions from conditionRuleViewer to
FilterMenuViewer so all of the static fields for that tab menu will be in
the same centralized location. I've also modified the edit text listener
to not automatically update the name of the static field filter if the
name entered is one that is not valid. In addition I have added a static
string field "initialFilterName" to FilterMenuActivity. This field stores
the original name of the filter passed into FilterMenuActivity. This is
used in the updated logic for the edit text listener to ensure that if the
user is viewing an already existing filter and they change the name to
something else and then change the name back to the original name that
there won't be a bug where the program thinks that they've entered in a
name that is already taken.
Merge pull request #122 from Tim727/master

Updated intent in FiltersActivity to use empty filter and modified code in other activities in that tab to refer to filter.getName() instead of the preexisting field "filterName". Also updated the savebutton listeners in TimeRule and ConditionalRule and o
added four methods to Filter.java ... (1) removeConditionRules(), (2)
removeTimeRules, (3) addSetOfConditionRules, (4) addSetOfTimeRules
Merge pull request #125 from Tim727/master

added a few methods to Filter.java because they made my life easier.
modified edit text listener in FilterOptionsActivity to make sure that the
filter name was not being updated unless the changes to the text field
represented a valid/acceptable unique name