Commit upgrade

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>
Merge branch 'dev' of https://github.com/liloQui/reader into dev

Signed-off-by: Kevin Kinnebrew <kevin.kinnebrew@gmail.com>

Conflicts:
	app/index.html
	app/scripts/config.js
	app/scripts/controllers/liloqui.js
	app/scripts/views/modal.js