Merge branch 'master' of https://github.com/jethrokuan/ol2
Merge branch 'master' of https://github.com/jethrokuan/ol2

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>

Conflicts:
	public/assets/application-a997ff5724688fc6d8b1757c8402770c.js.gz
	public/assets/application-d4d620d927b4fd478ec7b467a47fccd8.css.gz
	public/assets/jquery-8e3eeec9a63c444507aff45ee83b99f1.js.gz
	public/assets/jquery-ui-4856b8d4fb395706be8d907efda018e4.js.gz
	public/assets/localstorageshim-bd4f5da41d363a4297028f4f555d50ce.js.gz
	public/assets/reveal-f7829109f1de2d6977785908a404c896.css.gz
Merge branch 'master' of https://github.com/openlectures/ol2

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>

Conflicts:
	public/assets/application-a997ff5724688fc6d8b1757c8402770c.js.gz
	public/assets/application-d4d620d927b4fd478ec7b467a47fccd8.css.gz
	public/assets/jquery-8e3eeec9a63c444507aff45ee83b99f1.js.gz
	public/assets/jquery-ui-4856b8d4fb395706be8d907efda018e4.js.gz
	public/assets/localstorageshim-bd4f5da41d363a4297028f4f555d50ce.js.gz
	public/assets/reveal-f7829109f1de2d6977785908a404c896.css.gz
Updated gitignore to exclude those damn .ai files

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Deleted .ai source files

Signed-off-by: Kenneth Lim <kenlimmj@gmail.com>
Precompiled Assets
Unexpiring files
Half finished breadcrumbs #136, Removes login link, Closes #138