Updating to try and fix icheck and to add links to main/user menu
Merge branch 'master' of github.com:shanti-uva/drupal_shanti_sarvaka_theme
Update to user/main menu to put in custom account links and not display standard ones
Merge branch 'master' of github.com:shanti-uva/drupal_shanti_sarvaka_theme
fix to erroneous use of strpos in ternary conditional expression