Merge branch 'release-1.3' into develop

CHANGELOG

@@ -1,3 +1,8 @@
+v 1.3.0 dev
+  - Added logo to web interface
+  - Updated installation documentation
+  - Configuration using files rather than arguments
+
 v 1.2.0 dev
   - New task and build process
   - Web interface

README.md

@@ -2,18 +2,23 @@
 
 Features
 --------
-
 InTeXration is a *continuous integration* tool for building *LaTeX* documents. It integrates with *GitHub* using a WebHook. On each commit the specified latex files are compiled to a PDF. Include the URL to this PDF and build log in the repository's README to offer interested parties a compiled version of the document(s) inside it.
 
+
+Screenshot
+----------
+![InTeXration Screenshot](http://cdn.jonasdevlieghere.com/intexration_screenshot.png)
+
+
 Documentation
 -------------
-
 This project is in a very early development phase. Documentation might be missing or lagging behind. Thank you for your understanding!
 
 - [Installation](https://github.com/JDevlieghere/InTeXration/blob/master/docs/install.md)
 - [User's Manual](https://github.com/JDevlieghere/InTeXration/blob/master/docs/manual.md)
 - [Planned Features](https://github.com/JDevlieghere/InTeXration/blob/master/docs/planned_features.md)
 
+
 Adding InTeXration to your Project
 ----------------------------------
 You would like to try out InTeXration but don't have access to a VPS or decicated server? We're currently running both a stable and experiment release on our own servers. Contact me if you would like to obtain an API key!

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='InTeXration',
-    version='1.2.1dev',
+    version='1.3.0dev',
     packages=['intexration'],
     package_data={'': ['config/*.cfg', 'data/*.csv', 'logs/*.log', 'views/*.tpl', 'static/*/*']},
     include_package_data=True,