working on general setting module
unwanted js files removed from vendor
unwanted js files removed from vendor
conflicts removed master
bug removed from application.js file
vote setting cycles completed
admin settings completed
database.yml
removed conflicts
design integration for vote_setting
design integration for vote_setting
design integration for vote_setting
Merge branch 'master' of github.com:railskipl/meritize
props table created
Merge branch 'master' of github.com:railskipl/meritize
design integrated for setting page
Merge branch 'master' of github.com:railskipl/meritize
prop design
Merge branch 'master' of github.com:railskipl/meritize
changes in general setting design