Lined Edittext
Merge branch 'lined_edit'
Fix issue with panel not closing on 4.2
Merge branch 'collapse_panels'