Squashed commit of the following:
commit 23861a31bb2398ca61655c584bd8c75ee9bccdad
Merge: d44acf4b 
						
					
				
			 | 
			||
|---|---|---|
| .. | ||
| icons | ||
| js | ||
| lang | ||
| sass | ||
| views | ||
				
					
						
							Squashed commit of the following:
commit 23861a31bb2398ca61655c584bd8c75ee9bccdad
Merge: d44acf4b 
						
					
				
			 | 
			||
|---|---|---|
| .. | ||
| icons | ||
| js | ||
| lang | ||
| sass | ||
| views | ||