style updates, added new icons and lots of buttoning up
Fixed nilai var on bookmark page
Merge branch 'design-updates' into release-v0.5

Conflicts:
	assets/css/nilai.css
Fixed small resizing issue
Fix for pagination and update to work on all views
Merge branch 'release-v0.5' of github.com:plainmade/nilai into release-v0.5
Fixing checking defined ENV var in Plain_Config
Fixing issue with custom routing
Started updating the bookmarklet with new layout for adding labels and links
Fixed merges
Fixed the Settings Icon Button
Returned limit to 30 after testing of pagination completed
Merge branch 'release-v0.5' into 27-full-data-export