Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into Design_Assuty
#414 add the activeadmin gem
#414 generate instance for active admin
move the script/css file to the vendor
#414 modify schema/seeds
#414 add resources
Merge branch 'master' of github.com:alaashafaee/Coolsoft-14 into C1_Assuty_435_course_link_1.30
#481 changing to labels
link field within create course form
Issue #435 fix views
Issue #435 backend logic and validations
Issue #435 update seeds file
Issue #435 add edit course link
Issue #435 fix conventions