Simplified config
Ignored tilde files
Updated bootstrap.modalform for Bootstrap 3
Updated bootstrap.modalform for Bootstrap 3
Put questions in a collection
Merge branch 'feature/put_questions_in_collection' into develop