Banka | Adding ability to configure default instructions in treatment.
Shruthi, Banka | #685 | Added required location field in login.
                        Deleting cookies on logout.
Shruthi, Banka | Wrapping login username, password, location in an object instead of directly setting on scope.
#9 - Variables assigned primary n secondary color
#685 - home login ui fixed
#9 - reverted back to the secondary header color - WIP
Chethan,D3 | UI#15 | Make the navigation links cmd clickable
Banka, Shruthi | #687 | Using concept short name to display observation label when available
Rohan, Vinay | #000 | Fixing the add drug order view
ui#15 - Back button in doc upload app
Hemanth | #606 | fixed duplicate image issue when you try to delete and undoing delete.
Hemanth | focusing save button on change the concept name in document upload.
Hemanth,Bharti| #749| adding concise text areas for concept set observations
Rohan, Vinay | #592 | Displaying drug orders for past and current visits in treatment page
Merge branch 'master' into EA-1

Conflicts:
	ui/app/clinical/controllers/treatmentController.js
	ui/app/clinical/views/treatment.html
Rohan, Vinay | #592 | Added Provider info, fixed some tests. Fixed the warning issue in grunt