ok
Merge branch 'master' of https://github.com/groverz/droidapad

Conflicts:
	public/assets/application-098cc3a849c9c3b239967472cdc381f1.css.gz
	public/assets/application-be2a48ecc5d4332b37812336387f3455.js.gz
	public/assets/application.css.gz
	public/assets/application.js.gz