bundle update
bundle update
remove "embedded" from links

now being added in php
Merge branch 'master' into wordpress_emulate

Conflicts:
	Gemfile.lock
convert loans index to slim
merge master
convert embedded layout to slim
extract alerts to partial
import and set up wordpress layout; remove embedded layout
function to update wordpress template
whenever gem
set up cron job
wordpress template tweaks
bootstrap 3 upgrade, font awesome

upgrade html tags and classes to bootstrap 3 style, remove bootstrap
from rails (because it’s being loaded in the WP theme), replace
glyphicons with font awesome
update bootstrap rowlink plugin
css fixes & cleanup
auto update template if it doesn't exist
CSS changes & updates to fit in to new WP theme
start translations
Merge branch 'master' into translation

Conflicts:
	app/views/loans/index.html.erb