Merge branch 'master' into feature/russian-doll-caching

Conflicts:
	Gemfile.lock
	app/views/questions/_question_list.html.haml
add dalli gem and memcachedcloud config
Merge branch 'feature/russian-doll-caching' of github.com:askaway/askaway into feature/russian-doll-caching

Conflicts:
	app/views/questions/_question_list.html.haml