Created Condition Label
Added Colored Condition Labels
Updated Colors
Adding Nav Bars
Added Image Picker and Nav Controllers
Pre Merge Commit
Merge branch 'master' into UIUpdates2
Post Merge Commit