Fixing merge
Merge remote-tracking branch 'origin/master' into kvnkeith
Revert "fixing merge issue"

This reverts commit 7db0db0e2af3c4cc59de31d7d63307578cdfbe55.
Merge remote-tracking branch 'origin/master' into kvnkeith
Fixing

fixing merge issue
Changed Testfiles
Adding in functionality for component management.
Adding Bryan's user login code
Merging back to head
Room test

Tests to see if a light and sensor is properly added after new room is
created.
Added Tests for BaseStation

Added tests for adding room and behavior. Also ignored some tests that
haven't been implemented yet. Ive been having an issue with getting
Junit tests to run, turns out you need something called hamcrest, which
i downloaded and added to the classpath and it seems to run the tests
correctly now.
Forgot couple things

forgot this in the last commit.  Not sure if we should have a
getbehavior function in the basestation... but it does make it easier to
test that behaviors are being added or removed properly.
More Test Things

Not sure why, but an error appears during the creation of a behavior.
Might be a problem with my code, or something else. Not sure. Says
nullexception or something like that. Other tests for the simple
functions work fine with no errors.
stuff

added a line to the constructor of BaseStation. Im still not sure why Im
getting an error with the behavior constructor.
update

Log error, has to do with the searching functions I think.
Fixed Log Search Bugs

Bugs are removed, but GetYear, month, etc. are depreciated. It says to
use Calender instead. It works as is but it might be good to switch all
the date types to calender types.
latest

No significant changes
Behavior Testing Update

Adding actions seems to work fine, however, when creating a behavior
with conditions there seems to be a problem constructing the behavior
object. In the constructor, the part with the conditions seems to have
some sort of bug I think. Im not sure where the problem is, it could be
in the conditions java file somewhere. Looking around to try to figure
it out now.
Behavior Class comment

I think the behavior might be easier and simpler if it had ONE condition
and ONE action. Right now I think its too complicated to figure out. I
left a bit more details in the comments of the BehaviorTest.
fleshing out component adding UI