Temporary button changes

Back button can stay but other buttons will go..
Category button update

Text buttons with green round border. Text size increased.
UI update on Cardio

Will apply to rest of the entry activity
Cardio save-able

Also changed mood bar!
General Layout and Style stuff

Refactoring wheeeeee
Update almost done

Finishing up updating field btns in custom wo layout
Custom WO now fully updated and savable

Yay :)
Merge remote-tracking branch 'origin/master'

Conflicts:

	WorkoutLog/app/src/main/java/com/cs121/team2/workoutlog/EntryActivity.java
List Activity color coded

Why doesn't margin work :( Looks funky
Okay this is WOLog edit not UI

Adding type and subtype in WOLog.java
Sorry forgot to create a branch

Launcher icons
trying to get filter working

not working, but in better ways than before. Still a struggle.
Added textWatcher

Getting closer to filtering; things disappear and debugging suggests it
knows what should be in there. Just need the logs to show now...
Added a few more icons

We'll probably end up choosing between ic_launcher_4 and _5, it seems.
Icon change + wolog list print function

Brint function now have new lines in front of each field rather than the
end.
Got filtering to work!

Right now it's based on mood, but the filtering is in fact working now.
issues with type/name

need to keep testing with a new emulator device with fresh logs
No Data Entered LogListView Bug Fix

Fixed
Added btns for cardio unit

Explored different layouts with the buttons added, sticking with the
original
Un-nulling the logList

Sorry