Add travis for testing
various changes
Merge branch 'feature/admin_dashboard' into develop