Merge branch 'hotfix_cap_deploy' into develop
Merge branch 'develop' of github.com:ulmic/nastachku into develop
Merge branch 'hotfix_fix_schedule_height_script' into develop
Merge branch 'hotfix_fix_schedule_height_script' into develop
Merge branch 'hotfix_fix_schedule_height_script' into develop
Merge branch 'hotfix_fix_schedule_height_script' into develop
add .rvmrc
remove to ruby-version
fix default photo
fix icon top
fix ruby-version
Merge branch 'staging_rvm' into develop
fix layout
Merge branch 'develop'